From b26da44a76de4914e2b2d4cf5970a7a932f177b2 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 5 Aug 2004 22:25:17 +0000 Subject: [PATCH] bitkeeper revision 1.1145.1.1 (4112b3cd2EhCTP6gCuQGTMJlD8scmw) Patches from Charles Coffing. --- linux-2.4.26-xen-sparse/arch/xen/kernel/traps.c | 4 ++-- linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c | 2 ++ linux-2.6.7-xen-sparse/arch/xen/i386/kernel/traps.c | 4 ++-- linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/linux-2.4.26-xen-sparse/arch/xen/kernel/traps.c b/linux-2.4.26-xen-sparse/arch/xen/kernel/traps.c index 8e3523fd3c..548941bc58 100644 --- a/linux-2.4.26-xen-sparse/arch/xen/kernel/traps.c +++ b/linux-2.4.26-xen-sparse/arch/xen/kernel/traps.c @@ -449,8 +449,8 @@ void math_error(void *eip) default: break; case 0x001: /* Invalid Op */ - case 0x040: /* Stack Fault */ - case 0x240: /* Stack Fault | Direction */ + case 0x041: /* Stack Fault */ + case 0x241: /* Stack Fault | Direction */ info.si_code = FPE_FLTINV; break; case 0x002: /* Denormalize */ diff --git a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c index 5845544046..c56431e79f 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c @@ -137,8 +137,10 @@ static struct resource data_resource = { "Kernel data", 0, 0 }; * page as soon as fixmap is up and running. */ shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)empty_zero_page; +EXPORT_SYMBOL(HYPERVISOR_shared_info); unsigned long *phys_to_machine_mapping; +EXPORT_SYMBOL(phys_to_machine_mapping); multicall_entry_t multicall_list[8]; int nr_multicall_ents = 0; diff --git a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/traps.c b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/traps.c index b60b3abfc4..de4c9bee86 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/traps.c +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/traps.c @@ -722,8 +722,8 @@ void math_error(void *eip) default: break; case 0x001: /* Invalid Op */ - case 0x040: /* Stack Fault XXX? */ - case 0x240: /* Stack Fault | Direction XXX? */ + case 0x041: /* Stack Fault */ + case 0x241: /* Stack Fault | Direction */ info.si_code = FPE_FLTINV; /* Should we clear the SF or let user space do it ???? */ break; diff --git a/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c index 7cb6652222..07791b40c3 100644 --- a/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c +++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/evtchn.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -81,7 +82,7 @@ void evtchn_do_upcall(struct pt_regs *regs) local_irq_restore(flags); } - +EXPORT_SYMBOL(evtchn_do_upcall); static int find_unbound_irq(void) { -- 2.30.2